fixed formatting and add ndb