final adaptions
merge conflict