All changes implemented - tests running