Also update clear() in the client, comments