Agreed, not using source at all would be nice.