Updated source formats -- Still needs revising