Changes based on Lora's input.

Thoughts?