Source now a single entry and all 6 types of papers tested and working.