Fixed levels after refactoring