applied all comments