Should not add empty amounts
Better logging and same execution path for last unit as others