n1: Add EOS modifications