Feature/dcb 78/betty/grizzly