Handwriting minor changes in onFinish