hang changes
merged version