Bounding box added - works but needs improvement