manaual unlock and sync store refactor