Updated level switching