Made necessary changes to allow merge