Updated player state machine