Moved all the startup control to "baton"