include suggestions from ejmr