updated to use latest version of jog
merge with something