Finished second stage modifications