daniel's changes
merged