steps towards better level handling