trying to make sync better