Reactored GDBB - complete