Updated for CUDA 6.5 upgrade