Some changes made to these files