refactory 17/11/2014