Fixed if statement, includes and main class from eol to egl