leg wave update
merge