wards refactored