merge in Michael\'s changes from head