Change TODO to Wazi