improved way of syncing users