Third modification after analysis