Improved exiting on win