more changes for upstart control