finished sync with mostafa