Nic's changes