use new calculate logic