Changes per suggestions from staff