Fixed merge conflicts
Reverted to dickson's commit