capt-t

I will change a little bit more, so this PR can wait until then.

I have adjusted the pull request. The functions are renamed in #1141.

This can be merged when the compiled version has been tested. Further refinemens and additions can come after the next release.