Adam Jackson - GLX rewrite