anyway, this seems to work so I'll push