Client side logic changes