RSR: Code Changes