merged some old stuff that go added