changed according to recomendation