added week logic