Added handler for rereading