Now using week1 instead of functions