made changes according to client feedback