stage2 improved
stage 2 complete
Merge branch 'stage2'