Adding upstart into the mix