Reworked how options cascade