C-State code changes