Tightening pass on Ray