Updated to the new Startup