Collission protection

More info coming soon...