update based on Wiperdog's wiki report