update from numerical-mood master