Improved method for small viewports
Optimised build