change the lib to an earlier ver 7.x
more code refactoring