merging changes into GCBC