Changes from emendez