More Play -> Yalp changes

More GH-22 changes