Prep for easier startup