update from Quallenauge