refactored net wave