Merged Eric's changes