changed output format, added more sources