First attempt fixing offset issue.