Stage 2.1

some changes to stage 2