completed transition to ndb