Some refactor and first collision