Initial touchup for EOS