We develop a new econometric framework that simultaneously allows recovering heterogeneity in demand, TFP and markups across firms while leaving the correlation among the three unrestricted. We do this by systematically exploiting assumptions that are implicit in previous firm-level productivity...