zad2a/cw09 reorganized