Added clip handling.