Changes to make termination protocol to work!