incorporated aki's map, enabled simple data passing