Eigenfunctions with infinitely many isolated critical points

We construct a Riemannian metric on the $ 2 $-dimensional torus, such that for infinitely many eigenvalues of the Laplace-Beltrami operator, a corresponding eigenfunction has infinitely many isolated critical points. A minor modification of our construction implies that each of these eigenfunctions has a level set with infinitely many connected components (i.e., a linear combination of two eigenfunctions may have infinitely many nodal domains).