v2.0 update clear: change to function