added --no-restart option, needs more work