new + changes to accomodate new files