upgraded 'hun-zij' classifier