Iss22/bbb updates. Closes #22