Reordered current responsabilities