changed after recommendations
some aditional work