[PD] patch: Dynamic waves in Gem