get2gather fix
improvements
improvements
merge fix