Merge Follow Up

Added another action and transition to the statemachine