a Couple of changes to these 2 files