updated to fetch source