included Steve's comments