Maybe refactored render?