Modifing some file to be more streamlined