*Not working*
Commiting changes to match latest spec
missed some changes