some changes in commander state machine