diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessSubscriptionTransitionDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessSubscriptionTransitionDao.java
index fffcd8d..ebe0fe4 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessSubscriptionTransitionDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessSubscriptionTransitionDao.java
@@ -83,8 +83,7 @@ public class BusinessSubscriptionTransitionDao extends BusinessAnalyticsDaoBase
for (final SubscriptionBundle bundle : bundles) {
final Collection<Subscription> subscriptions = getSubscriptionsForBundle(bundle.getId(), context);
for (final Subscription subscription : subscriptions) {
- // TODO
- final List<SubscriptionTransition> transitions = new LinkedList<SubscriptionTransition>();
+ final List<SubscriptionTransition> transitions = subscription.getAllTransitions();
BusinessSubscriptionTransitionModelDao prevBst = null;
diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceModelDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceModelDao.java
index 4861688..803a0d2 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceModelDao.java
@@ -96,7 +96,7 @@ public class BusinessInvoiceModelDao extends BusinessModelDaoBase {
invoice.getBalance(),
invoice.getPaidAmount(),
invoice.getChargedAmount(),
- null /* TODO */,
+ invoice.getOriginalChargedAmount(),
invoice.getCreditAdjAmount(),
invoice.getCreatedDate(),
creationAuditLog.getUserName(),
