Continued work on EGL implementation