applied changes to these files too