rebased to nics latest
rebased with nics changes