mhahsler refactored code.