adding suggestions by y-p