Some modifications
Some stuff in Go