Make changes according to client