sync with recent changes