last commit before third collision overhaul.