Trying viewport width and height
Optimised build
Merge branch 'v3'