More work with startup/shutdown