integrated Dan's comments