Reverts changes to working
Merge branch 'revert'