Sound refactored