Reverting to working version
Reverting to working version and merging into master