Cleaning up stage 2 (Work in Progress)