Added self updating