Some updates to final analysis