updates to avoid cross domain issues.