WIP
update ioc ref and more fixes for engagement.