Updated to address Jon's critique