Update with main / Position fix