Moved from laugh on shake to wah wah wah and did some refactoring