- finally finished the handler