Update to instant updating code