further changes
pair-programmed with Glenn