fixing changes
merge changes
Changed paths to fix bugs