removed references to noc and brought in transaction and component