Moved calculation for live updates