fixes within the example implementation