Enabling setting (3/31)

Enabling setting