Initial changes in BW_gpu.*