Fixing old code
Merging