reformat and add sources