Improved clipping problem

Less laggy and less buggy