Added collisions and state