update based on pr feedback