Sources done (added fix for Published Sources)