MAde some changes