Wave refactoring
2020
Wave refactoring