incorporate feedback from dave