Manual + some task2 funct update