Restartless shot

Needs testing.