change to mPosition and mSpawn
Merge branch 'master' into John-DiBaggio