Pull Nic's changes

Pull Nic's changes