fixing up reply and state