viveca
merge conflicts fixed