Mostly new player code from Fujii