Updated Pokal implementation