batting out of order

[smoump]

Here we go again, I wish to double check my understanding of this rule.

Example: Batter 1 comes to plate and gets a single. B2 makes an out. Now, instead of B3 coming to the plate, B4 steps into the box. B4 gets a single and B1(R1) advances to third. B3 now comes to the plate and steps into box (live ball).

Situation A) before first pitch to B3, defensive team requests time and brings the problem to the attention of the PU. Solution: B3 is ruled out, B4 is brought back to plate, and B1(R1) is returned to first. B5 will be the next batter. Correct?

Situation B) defensive team brings it to the attention of PU after a pitch was delivered to B3. Solution: B3 is replaced with B5 and assumes B3's count. B4 stays at first and B1 stays at third. Correct?