Tj branch

Collision fixed