Added some changes 3