updated model to include year & week