Updated for latest version of CUB