Updated Startup. Currently has bug