Client side calcuration

It might be already pulled.