Update code, fetch position right away when starting.
Reorganize