Rework PaPie qs on