Merged in GDBB code