This is the working version with maps and charts