refactors with the complete original hash