katzpagh stuff fixed