Now do it in other files too