Change restartwiater location, make it not static.