Preparation for "re-start" feature