re-added changes to rest.go after rebase