replace tddium with solano after rebase