@cdaversin re-add pi and Pi