Changing to CLOS.