Updated analysis with new corrections