Better repopulate script