changes from Clearcode - fixed