Make things smoother