poland (and includes a tiny refactor about corpus christi) refs #19