Hopefully this is a good combination of LRs and values...
merged changes