New example, small improvements.