Nikki's changes