Refactored opacity