postFinal refactor #3