added some files missed in last merge