Changed Master to use smach