I changed lance to Smith
I fixed merge conflict between Lonnie and Smith