More changes for threshold switch