remade some tasks