Removed calc_total from instansations