Added some changes 2