friday final commit2