phase 2 logic finished - ish