examples/ improvements