Updated collision engine