collision added

collision added not ready yet
Merge branch 'Christoph'