Refactor 20/08/2014