Updated to use upstart