Merge Startup2 into Startup
Format changes