Optimized renderer beta

Fixes #4628