Analysis improved