feedback incorporated
merged