added better validation to __source_all