merging changes from erra