Improves both the library and the example