more changes to fix code

Trying to fix code further = still not right