if you take my variant, this will need to be rewritten too to match.