Refactored promises complete