Refactor of the continuation