Add lots of L based goodness