Hopefully handle reloads better