Added fine tuning and restart support