Added collisions and stuffs