Changed Calendar to use event date