TYPOC-20  add functionality