improvements 2
merged