Added exit via button capability