Added collisions; changed defines