Lib OK. Tested by Mark