Latest refactors until today