initial buggy 3rd collision overhaul