incorporate feedback from @rganguly