Changes to run also without reading the MC (Chiara B)