Updating with new code from this morning...
Fixing merge conflict