minor adjustments
merge conflicts