Some examples, code changes and tests