fixed up master br
backend structure