WIP Wave refactoring
Correcting and old mistake