oglwrap rework