few adjustments based on #8.