rearranging to help go install