Adding BBox, need to do testing