UPDATE: changed EOT output structure