task02 ok, task01 some changes