More adjustments to level2