Changes to Transition from another pull request, that got omitted in my first checkin