Work on reentrancy