tweaking examples to follow API more closely