Working version including bounding boxes