Make better use of lenses