Stage 2.2

Some changes to stage 2