upstart modifications
merge