repay front - end and back - end final

Signed-off-by: Yasen Yankov <iasen.iankov@gmail.com>