Update with the viewport patch