Refactored continue stuff