reworking complete challenge flow