Changed to account for class addition.