Client side has been improved