Client side logic added