Incorporate Ed's changes