Added pre-startup stuff