Author: Taruskin/Gibbs