Modify as one callee state machine