Some hash changes
Some adjustments