refactoring and another experimental thumb