Reverting changes

Reverting some of Daniel's changes