Updated Calendar and Map Code