Exp function added
merge conflict resolved
Merge conflicts actually resolved this time