merge in clovis's updates