Incorporate suggestions from dove