Improve the EC Manipulator