added stop-switch