updated to work with latest slc