some biggish upgrade changes