Dawine's changes
change to banhji_view from Dawine