incorporating feedback from Diako