improved and adjusted collaborative behaviour
merge