added my changes
Cleanup the mess I made earlier
Merging his changes