Updated level selection mechanism