XPI Update verbessen :honeybee: