Working version, post-defense.