Refactored grapevine