Collition update

more systemazation