Updating PR accordingly as requested