Saner source layout