collision update, still a mess