Updated
Fix conflicts
Added Some minor stuff
Fixing the merge conflicts