Tightening pass on Luminary