made ade some changes and addition