improvements for goma
updated for changes in goma