some changes made
major changes made

i gave this to the team