Unbutcher @koo04's code