Made modifications requested by the client