Re-entrancy

This is the start for Re-Entrancy issue