New version with analytic solution + polar coordinates