0.9.2 library with required changes