Added some changes for merge