small changes, frank is still stuggling with collisions