solve 34, 35, update next for golang changes