Added dynamic rendering
Updated version