SONIC: Code Changes