zad3 full, minor changes in zad1 i zad2