updated handling of upstart recognition and handling