refactor 2nd June 2014