Tightening pass on Aspect