Adding boolean to be used in quit case