zad2b almost implemented, small fix to zad2a