sync with final commit