I'm aware of the waving problem, sorting this out as soon as I work out how to!