Updated to use data only from BanterDataModel
Merge remote-tracking branch 'origin/master'