Hacks to add calendar