border collisions working again