Rearchitect state machine to only listen for peaks