completed updating handle class