[Task] some Modifications