new finalize logic

Signed-off-by: Vladimir Vidinliev <v.vidinliev@gmail.com>