Updated server code to always re-calc on startup