small additions
merge conflicts