Started implementing State 21