putting back some type annotations