wip fixing panorama