improvements to previous commit