Quick main changes