take Aaron's suggestions into account