Bringing calendar in line with 327
Got rid of second 'as well as', need to fix up language more