Adapting code for the GBBGs - were some missing values etc that caused problems