Exit button working under new system