Bruno's changes restored