rewrite samples && update response format