Pop flicker fixed
Optimised build