minor adjustments to previous commit