fix: refactored FOR THE WIN