Updated from work, GURP working

Signed-off-by: tabook <jx2014@users.noreply.github.com>