Library function now generates from ALL sources