Thanks. I didn't get very far with my re-factor as I was confused by the `dtype` change.