WIP GXT3 changes