More on deferred
Merge branch 'robin_branch'
Fixed resolution