moving calculate to show