forgot to add total, grr. and some other stuff