- rethink handling of examples
