added changes from team 1