Un-commenting critical code