New 2-ways approval

Mainly new way (short) approval was added. + a lot of improvements