added feature flags for the watts selction and locking