Mucking around with the Mb API. Some improvements.