GPU version of X Water done