More main changes