fixed the changes
more fixes