incorporate suggestions by dgm5555