Restart link, some refactoring