Updated code samples from 03 October 2013