testing some ideas for the examples
merged changes