use Winston's hidden-state branch for now