Finish work on Reparameterize