Continue work on the GL3 port