First version where collision handling works