adjustments based on sean's comments