altered week-cal code, rel #390