Uses new way to allow clipping.
Fixes merge conflicts.