Simpler, but still fumbling mightily