Calendar Week Logic

update