remove debug, add total