Implemented Heather's changes