Updated with contacts at EPFL