Implemented Mike Ledger's suggested lens changes.