Updated collision system