gradually removing math see #88