Switched units to C