Update task
Restore cross domain headers
Given -> When