Implemented Evan's changes.