Some DS1 optimizations. Now we have a new class, ClipClass