small changes
merged solved