Changed startup/shutdown