updating to work with latest go