I cannot see any way for it to account for rider swap times. Even if you enter the attraction in 2x, it's not going to put riding them 2x in a row in most cases. I thought about adding a break after you made your first plan (see how long the ride takes, then add a break in right after it for the same amount of time), but then when you re-made your plan, it will probably shuffle everything around again due to the break time, which pretty much defeats the purpose of that. Of course, you don't have to do the baby swap thing right away, do you - so maybe just adding the attraction in 2x would work. But it also might tell you to get a FP for your 2nd time, and you wouldn't need that. (I guess I'm glad we don't have to worry about the rider swap thing - we just mostly skipped things altogether when our kids were too small to do something)!