postFinal refactor #2