more updates regarding pr feedback