Improved conquest logic