update these two files to contain recent additions