Replacing clint with click 2.0