small changes
now working