I think we'll still be limited to 5, but you will be able to switch the one you are using without having to go back to the stable to get the other one. It's been awhile since I read it, though, so I may be wrong on the number.