Moved back to exit only functionality