refactored. thanks faizaan
Merge branch 'isbndb'