Reworks how server saves estimates