Update with NTU code