RAY: Code Changes