rebasing on latest tools