Updated overview calculations