Make this work with the march_hare changes