sync with tufts version