just before re-organizing library patch