replaced some stuff with lenses