adding analyzer back, too many conflicts before