Further work on GPU implementation