1.7 ~ switch recalc