Updated Wave Transitions to wrap properly