Update 2.0

GPU WIP