2021-07-15: rewritten for CMK 2.0