Faster and clipping support added