Multiple changes to simplify using panorama.