Using a large longitudinal, nationally representative workplace-level dataset, we explore the productivity gains associated with computer use and organizational redesign. The empirical strategy involves the estimation of a production function, augmented to account for technology use and organizational design, correcting for unobserved heterogeneity. We find large returns associated with computer use. We also find that computer use and organizational redesign may be complements or substitutes in production, and that the productivity gains associated with organizational redesign are industry-specific.