Added state 6,7,8,9 logic