update to rev 2367 incl. own stuff