Added NoC stuff