Merging Lance's edits