better source layout