upgrade to bem-core v2, enb