working on auto-sync