Finish incorporating Eric's changes