Cleared a todo for ++trg