removed general onFinish callback