Improved collision. Almost Done.