incorporate feedback from jonathan