C2 : Small changes, removed a todo