removed dependency on either
new lenses and prisms