updated to work with newest gf (with new pixi)