merged the new files from the gpu branch, but not the other changes