New code with more code samples