Minor changes for multi-level.