Add exit on end