Addresses more pr feedback