commining some of the changes