[Client] Modification