Changed locations to reflect actual categories, sources, etc