adjustments according to comments