add these commits from long time ago to clean up git history