Handle stuff better