Feature/en 1831

Out of date comment. Also, when do we need to handle a list of fidelities?