Make the appli smoother