more rearranging to try and get go get to work