Changes to accommodate delaying ionization until the first step AFTER trad