Got a better idea for fixing all the shifting.