Changes didn't work

Returned to old version to continue with the changes later.