Added in logic for C cmmds