re-arrange core.cl2
update equals