Updated logic to fix weeks not changing