working on user sync support