@seberg I think this looks OK.