Updated to produciton level TTD code. Also need to conitune diagnosing o2