EOS Improvements