update to address PR comments