PI parser got even better...