Use a map more like the original code
document my changes
update version and authors