merging changes from gal