Added eviolite and baton pass calculations.