adding CSL consts but not thrilled with current format