active hash refactoring - partialy done