added map and all