refectored local task + add changed base task