small chages
merged