update with the (probably) final PR