Added server side to deal with week of data