Consistent entry and exit points

Consistent entry and exit points