updated for panorama