Dropped C for C++ simplified impl major improvements

2

mend