upadted for Widebase 0.3.1