Update for newttrs and lens changes