Updated accordingly client feedback