Updated mbz logic