Started on cuda
fixed merge