added in week/year argument where necessary
modified setup_picks() back to original format