Split RollOver related code out