added activity and enabled switching