More changes towards what the client requested