Fixing problems from Merging

Merging problems fixed now