t658 support for formulae WIP