add serve and put back wr