State Machine: incorporated push review findings