Added Niki's changes to Nikki's repo