cleaned up and reloaded