improving collision handling WIP