Added check if enabled in settings