Changes to allow merge