optimised mode incorporated into libray