Changed #3 of Calendar to use server data