Removed red border styling, unexpected result, leaving as-is for now
Merge branch 'next_state_logic'