small collision changes, still imperfect