incorporate feedback from dylan