Updates by kundelfingerhof