Changed code examples to new situation.