removed tabs, added map.