Replacing the remaining 'cl functions