incorporate feedback from d-lo