simplify those new tasks
update setup task as well