stage 2 final commit