Added client kill switch