Commit of Scott's changes