Refactor the EOS event