[Nathan] Fixed problems Kirsten was having