Last commit of feature/cuda from Chenhan