After EOM zeroes order
Various changes in general