Finish example with improvements