Discarded old table interface and fixed calculation algorithm