better weeks handling