Remove Roo dependancy, add Elliot's changes