hren
merged with my changes