my small edits to these 2 files