few changes to make go work