Revert "Revert "nic""

This reverts commit 9972c1a7d32777ca123bf31357a1c86710dd8d20.
nic2