Updates to Adam's branch and RLI updates