suggested alterations from Doc