Worked on Fixes