update from andibraeu