Code rewrite, collision disabled temporarily.