Restarted, more generic