Started to implement TOSTR final version