Organize and fix level being applied late