added EOT module and updated everything