slight restructuring which make it easier to load further panoramas