Clarity and prep for the switch