worked on rest handlers