Add better calendar