added map, changed specs