started adding disabled mode