Improved enter/exit