Add (still broken) reloading after setup