Changes for Lens-21