sync with upstream
added sources