integrated Nic's comments