Added waterjet option