First step, refactoring the historic