pulling some of the recent changes